Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump ibc to 8.5.0 (backport #4341) #4351

Merged
merged 4 commits into from
Sep 11, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 11, 2024

Closes: #4318


This is an automatic backport of pull request #4341 done by Mergify.

* chore: bump ibc to 8.5.0

* cl

* use pseudo version until 8.5.1

(cherry picked from commit 0568145)

# Conflicts:
#	ignite/templates/app/files/go.mod.plush
@mergify mergify bot added the conflicts label Sep 11, 2024
Copy link
Contributor Author

mergify bot commented Sep 11, 2024

Cherry-pick of 0568145 has failed:

On branch mergify/bp/release/v28.x.y/pr-4341
Your branch is up to date with 'origin/release/v28.x.y'.

You are currently cherry-picking commit 05681456.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   changelog.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ignite/templates/app/files/go.mod.plush

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@julienrbrt julienrbrt added skip-changelog Don't check changelog for new entries and removed conflicts labels Sep 11, 2024
@julienrbrt julienrbrt merged commit 72244a7 into release/v28.x.y Sep 11, 2024
40 of 43 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v28.x.y/pr-4341 branch September 11, 2024 12:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component:ci CI/CD workflow and automated jobs. component:configs component:templates skip-changelog Don't check changelog for new entries
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant